diff --git a/Wrapper/ToolbarWrapper.cs b/Wrapper/ToolbarWrapper.cs
index 6a75ab5..b82e70c 100644
--- a/Wrapper/ToolbarWrapper.cs
+++ b/Wrapper/ToolbarWrapper.cs
@@ -726,9 +726,14 @@ internal ToolbarTypes() {
 		}
 
 		internal static Type getType(string name) {
-			return AssemblyLoader.loadedAssemblies
-				.SelectMany(a => a.assembly.GetExportedTypes())
-				.SingleOrDefault(t => t.FullName == name);
+			Type type = null;
+			AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+			{
+				if (t.FullName == name)
+					type = t;
+			});
+			
+			return type;
 		}
 
 		internal static PropertyInfo getProperty(Type type, string name) {