diff --git a/src/main/java/com/wordnik/swagger/codegen/ResourceMethod.java b/src/main/java/com/wordnik/swagger/codegen/ResourceMethod.java
index 87de5aabc7b..cd09b1ddcf3 100644
--- a/src/main/java/com/wordnik/swagger/codegen/ResourceMethod.java
+++ b/src/main/java/com/wordnik/swagger/codegen/ResourceMethod.java
@@ -31,7 +31,9 @@ public class ResourceMethod {
 	private List<MethodArgument> queryParameters;
 	
 	private List<MethodArgument> pathParameters;
-	
+
+    private String returnValueFromOperationJson;
+
 	private String returnValue;
 	
 	private String returnClassName;
@@ -114,6 +116,14 @@ public class ResourceMethod {
 		this.returnValue = returnValue;
 	}
 
+	public String getReturnValueFromOperationJson() {
+		return returnValueFromOperationJson;
+	}
+
+	public void setReturnValueFromOperationJson(String returnValue) {
+		this.returnValueFromOperationJson = returnValue;
+	}
+
 	public String getReturnClassName() {
 		return returnClassName;
 	}
@@ -206,7 +216,7 @@ public class ResourceMethod {
 	}
 	
 	public boolean isReturnValueList() {
-		if(this.getReturnValue().startsWith("List")){
+		if(this.getReturnValueFromOperationJson().startsWith("List")){
 			return true;
 		}
 		return false;
diff --git a/src/main/java/com/wordnik/swagger/codegen/resource/EndpointOperation.java b/src/main/java/com/wordnik/swagger/codegen/resource/EndpointOperation.java
index 829e737687c..6f1419d8dbb 100644
--- a/src/main/java/com/wordnik/swagger/codegen/resource/EndpointOperation.java
+++ b/src/main/java/com/wordnik/swagger/codegen/resource/EndpointOperation.java
@@ -310,6 +310,7 @@ public class EndpointOperation {
 			else{
 				method.setHasResponseValue(true);
 			}
+            method.setReturnValueFromOperationJson(responseClass);
 			method.setReturnValue(dataTypeMapper.getClassType(responseClass, false));
 			method.setReturnClassName(dataTypeMapper.getGenericType(responseClass));