diff --git a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
index ec0d0116b8a..988a2b7c6cc 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
@@ -436,7 +436,7 @@ class Codegen(config: CodegenConfig) {
         val ComplexTypeMatcher(basePart) = operation.responseClass
 
         properties += "returnType" -> config.processResponseDeclaration(operation.responseClass.replaceAll(basePart, config.processResponseClass(basePart).get))
-        properties += "returnContainer" -> (operation.responseClass.substring(0, n))
+        properties += "returnContainer" -> config.processResponseClass(operation.responseClass.substring(0, n))
         properties += "returnBaseType" -> config.processResponseClass(basePart)
         properties += "returnTypeIsPrimitive" -> {
           (config.languageSpecificPrimitives.contains(basePart) || primitives.contains(basePart)) match {