diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
index 0ef00cf111c..57c5e96b841 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
@@ -6,9 +6,9 @@ using {{packageName}}.Model;
 
 namespace {{packageName}}.Module
 { {{#operations}}
-    {{#operation}}{{#allParams}}{{#isEnum}}
-    {{>innerEnum}}
-    {{/isEnum}}{{/allParams}}{{/operation}}
+    {{#operation}}{{#allParams}}{{#isEnum}}{{>innerEnum}}
+    {{/isEnum}}{{#items.isEnum}}{{#items}}{{>innerEnum}}{{/items}}
+    {{/items.isEnum}}{{/allParams}}{{/operation}}
 
     public sealed class {{classname}}Module : NancyModule
     {
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/innerEnum.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/innerEnum.mustache
index e856bdbae0d..19e4731f2cf 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/innerEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/innerEnum.mustache
@@ -1 +1 @@
-public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}} { {{#allowableValues}}{{#enumVars}}{{{name}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}} };
\ No newline at end of file
+public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} { {{#allowableValues}}{{#enumVars}}{{{name}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}} };
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache
index 8510fe2e961..a8c6ed3f54c 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache
@@ -11,8 +11,9 @@ namespace {{packageName}}.Model
     public sealed class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
     {
         {{#vars}}{{#isEnum}}
-        {{>innerEnum}}
-        {{/isEnum}}{{/vars}}{{#vars}}
+        {{>innerEnum}}{{/isEnum}}{{#items.isEnum}}
+        {{#items}}{{>innerEnum}}{{/items}}
+        {{/items.isEnum}}{{/vars}}{{#vars}}
         public {{>nullableDataType}} {{name}} { get; private set; }
         {{/vars}}
 
@@ -33,7 +34,7 @@ namespace {{packageName}}.Model
             return Builder()
             {{#vars}}
                 .{{name}}({{name}})
-{{/vars}}           ;
+{{/vars}}            ;
         }
 
         public override string ToString()
@@ -56,12 +57,12 @@ namespace {{packageName}}.Model
             return this.PropertiesHash();
         }
 
-        public static bool operator ==({{classname}} left, {{classname}} right)
+        public static bool operator == ({{classname}} left, {{classname}} right)
         {
             return Equals(left, right);
         }
 
-        public static bool operator !=({{classname}} left, {{classname}} right)
+        public static bool operator != ({{classname}} left, {{classname}} right)
         {
             return !Equals(left, right);
         }