diff --git a/src/main/java/com/mysema/codegen/model/ClassType.java b/src/main/java/com/mysema/codegen/model/ClassType.java
index 4a2a42f59..037b89664 100644
--- a/src/main/java/com/mysema/codegen/model/ClassType.java
+++ b/src/main/java/com/mysema/codegen/model/ClassType.java
@@ -103,10 +103,10 @@ public class ClassType<T> implements Type {
                 if (!first){
                     builder.append(",");
                 }
-                if (parameter == null || parameter.equals(this)){
+                if (parameter == null || parameter.getFullName().equals(getFullName())){
                     builder.append("?");
                 }else{
-                    builder.append(parameter.getGenericName(true, packages, classes));    
+                    builder.append(parameter.getGenericName(false, packages, classes));    
                 }                
                 first = false;
             }
diff --git a/src/main/java/com/mysema/codegen/model/SimpleType.java b/src/main/java/com/mysema/codegen/model/SimpleType.java
index 9c2f5e1e7..7b32b8dc9 100644
--- a/src/main/java/com/mysema/codegen/model/SimpleType.java
+++ b/src/main/java/com/mysema/codegen/model/SimpleType.java
@@ -110,10 +110,10 @@ public class SimpleType implements Type {
                 if (!first){
                     builder.append(",");
                 }
-                if (parameter == null || parameter.equals(this)){
+                if (parameter == null || parameter.getFullName().equals(fullName)){
                     builder.append("?");
                 }else{
-                    builder.append(parameter.getGenericName(true, packages, classes));    
+                    builder.append(parameter.getGenericName(false, packages, classes));    
                 }                
                 first = false;
             }