1 files changed, 4 insertions, 1 deletions
diff --git a/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts b/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts
index c4ba64a8af..9df2b2b341 100644
--- a/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts
+++ b/catalog-ui/src/app/models/properties-inputs/derived-fe-property.ts
@@ -99,7 +99,7 @@ export class DerivedFEProperty extends PropertyBEModel {
                             this.toscaPath.push((Number(toscaIndex) + 1).toString());
                         }
                     } else {
-                        this.toscaPath.push("0");
+                        this.toscaPath.push((property.valueObj.length).toString());
                     }
                 } else {
                     if (property instanceof PropertyFEModel && property.valueObj != '') {
@@ -111,6 +111,9 @@ export class DerivedFEProperty extends PropertyBEModel {
                         }
                     } else {
                         parentKey = "0";
+                        if (property instanceof PropertyFEModel) {
+                            parentKey = (property.flattenedChildren.length).toString();
+                        }
                     }
                     this.toscaPath.push(parentKey);
                 }