diff --git a/src/formGenerator.vue b/src/formGenerator.vue
index 286829f9..c72cf97d 100644
--- a/src/formGenerator.vue
+++ b/src/formGenerator.vue
@@ -17,7 +17,7 @@ div.vue-form-generator(v-if='schema != null')
 					span(v-for='(error, index) in fieldErrors(field)', track-by='index') {{ error }}
 
 	template(v-for='group in groups')
-		fieldset(:is='tag')
+		fieldset(:is='tag', :class='getFieldRowClasses(group)')
 			legend(v-if='group.legend') {{ group.legend }}
 			template(v-for='field in group.fields')
 				.form-group(v-if='fieldVisible(field)', :class='getFieldRowClasses(field)')
@@ -191,7 +191,9 @@ div.vue-form-generator(v-if='schema != null')
 					baseClasses[field.styleClasses] = true;
 				}
 
-				baseClasses["field-" + field.type] = true;
+				if (!isNil(field.type)) {
+					baseClasses["field-" + field.type] = true;
+				}
 
 				return baseClasses;
 			},