@@ -255,6 +255,9 @@ public void MethodWithParamsTest()
         [Test]
         public void TestGenericMethodBinding()
         {
+            // Test matching generic
+            // i.e. function signature is <T>(Generic<T> var1)
+
             // Run in C#
             var class1 = new TestGenericClass1();
             var class2 = new TestGenericClass2();
@@ -285,6 +288,9 @@ raise AssertionError('Values were not updated')
         [Test]
         public void TestMultipleGenericMethodBinding()
         {
+            // Test matching multiple generics
+            // i.e. function signature is <T,K>(Generic<T,K> var1)
+
             // Run in C#
             var class1 = new TestMultipleGenericClass1();
             var class2 = new TestMultipleGenericClass2();
@@ -315,6 +321,9 @@ raise AssertionError('Values were not updated')
                 [Test]
         public void TestMultipleGenericParamMethodBinding()
         {
+            // Test multiple param generics matching
+            // i.e. function signature is <T,K>(Generic1<T> var1, Generic<T,K> var2)
+
             // Run in C#
             var class1a = new TestGenericClass1();
             var class1b = new TestMultipleGenericClass1();
@@ -358,8 +367,11 @@ raise AssertionError('Values were not updated')
         }
 
         [Test]
-        public void TestMultipleGenericParamMethodBinding2()
+        public void TestMultipleGenericParamMethodBinding_MixedOrder()
         {
+            // Test matching multiple param generics with mixed order
+            // i.e. function signature is <T,K>(Generic1<K> var1, Generic<T,K> var2)
+
             // Run in C#
             var class1a = new TestGenericClass2();
             var class1b = new TestMultipleGenericClass1();
@@ -401,6 +413,33 @@ raise AssertionError('Values were not updated')
 "));
         }
 
+        [Test]
+        public void TestPyClassGenericBinding(){
+        // Overriding our generics in Python we should still match with the generic method
+            Assert.DoesNotThrow(() => PythonEngine.ModuleFromString("test", @"
+from clr import AddReference
+AddReference(""System"")
+AddReference(""Python.EmbeddingTest"")
+from Python.EmbeddingTest import *
+
+class PyGenericClass(TestMethodBinder.TestGenericClass1):
+    pass
+
+class PyMultipleGenericClass(TestMethodBinder.TestMultipleGenericClass1):
+    pass
+
+singleGenericClass = PyGenericClass()
+multiGenericClass = PyMultipleGenericClass()
+
+TestMethodBinder.TestGenericMethod(singleGenericClass)
+TestMethodBinder.TestMultipleGenericMethod(multiGenericClass)
+TestMethodBinder.TestMultipleGenericParamsMethod(singleGenericClass, multiGenericClass)
+
+if singleGenericClass.Value != 1 or multiGenericClass.Value != 1:
+    raise AssertionError('Values were not updated')
+"));
+        }
+
         public class CSharpModel
         {
             public static dynamic ProvidedArgument;
 
@@ -124,9 +124,6 @@ internal static MethodInfo ResolveGenericMethod(MethodInfo method, Type[] argTyp
             var methodGenerics = method.GetGenericArguments();
             var methodGenericMap = new Dictionary<Type, Type>();
 
-            // The generics matching these args to the method
-            var argsGenericMap = new Dictionary<Type, Type[]>();
-
             // Just cache this type for sake of performance on iterations
             var objType = typeof(object);
 
@@ -151,7 +148,6 @@ internal static MethodInfo ResolveGenericMethod(MethodInfo method, Type[] argTyp
                     // If the generic type matches our params generic definition, this is our match
                     // go ahead and match these types to this arg
                     if (paramGenericDefinition == genericType) {
-                        argsGenericMap.Add(argTypes[k], currentType.GenericTypeArguments);
 
                         // The matching generic for this method parameter
                         var paramGenerics = parameters[k].ParameterType.GenericTypeArguments;