diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts
index e27c783..a304f1a 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts
@@ -251,11 +251,15 @@
         let valid = true;
         if (this.currentTab === this.TYPE_INPUT) {
             _.forEach(this.inputParameters, param => {
-                if (!param.name || !param.property) valid = false;
+                if (!param.name || !param.property) {
+                    valid = false;
+                }
             });
         } else {
             _.forEach(this.outputParameters, param => {
-                if (!param.name || !param.type) valid = false;
+                if (!param.name || !param.type) {
+                    valid = false;
+                }
             });
         }
         return valid;
diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts
index 9bedfa7..a12425d 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/param-row/param-row.component.ts
@@ -50,9 +50,8 @@
                 _.toArray(dataTypes),
                 (type: any) => type.name === prop.type
             );
-            if (!type.properties) {
-                flattenedProps.push(prop);
-            } else {
+            flattenedProps.push(prop);
+            if (type.properties) {
                 _.forEach(type.properties, subType => {
                     if (this.isTypePrimitive(subType.type)) {
                         flattenedProps.push({