diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs
index a39775135..ff60f69cd 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs
@@ -71,6 +71,13 @@ public TypeNameMapGenerator (IEnumerable<string> assemblies, Action<string, obje
 			var rp          = new ReaderParameters (ReadingMode.Immediate);
 
 			using (var resolver = new DirectoryAssemblyResolver (Log, loadDebugSymbols: true, loadReaderParameters: rp)) {
+				foreach (var assembly in Assemblies) {
+					var directory   = Path.GetDirectoryName (assembly);
+					if (string.IsNullOrEmpty (directory))
+						continue;
+					if (!resolver.SearchDirectories.Contains (directory))
+						resolver.SearchDirectories.Add (directory);
+				}
 				foreach (var assembly in Assemblies) {
 					resolver.Load (Path.GetFullPath (assembly));
 				}