diff --git a/src/main/java/com/wordnik/swagger/codegen/resource/Endpoint.java b/src/main/java/com/wordnik/swagger/codegen/resource/Endpoint.java
index 0c7ccb977b9..3356368511b 100644
--- a/src/main/java/com/wordnik/swagger/codegen/resource/Endpoint.java
+++ b/src/main/java/com/wordnik/swagger/codegen/resource/Endpoint.java
@@ -131,24 +131,13 @@ public class Endpoint {
             if (modelField.getParamType().equalsIgnoreCase(EndpointOperation.PARAM_TYPE_BODY) ){
                 isParamSetAvailable = false;
                 for(Model model : resource.getModels()){
-                    if(modelField.getValueTypeInternal() != null) {
-                        if(dataTypeMapper.isPrimitiveType(modelField.getValueTypeInternal())){
-                            isParamSetAvailable = true;
-                            break;
-                        }
-                        if(modelField.getValueTypeInternal().endsWith(model.getName())){
-                            isParamSetAvailable = true;
-                            break;
-                        }
-                    }else{
-                        if(dataTypeMapper.isPrimitiveType(modelField.getDataType())){
-                            isParamSetAvailable = true;
-                            break;
-                        }
-                        if(model.getName().equalsIgnoreCase(modelField.getDataType())){
-                            isParamSetAvailable = true;
-                            break;
-                        }
+                    if(dataTypeMapper.isPrimitiveType(modelField.getDataType())){
+                        isParamSetAvailable = true;
+                        break;
+                    }
+                    if(model.getName().equalsIgnoreCase(modelField.getDataType())){
+                        isParamSetAvailable = true;
+                        break;
                     }
                 }
                 if(!isParamSetAvailable){