1 files changed, 5 insertions, 2 deletions
diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts
index 9fdc8c19aa..b0146cc1cf 100644
--- a/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts
+++ b/catalog-ui/src/app/ng2/pages/properties-assignment/tosca-function/tosca-get-function/tosca-get-function.component.ts
@@ -267,7 +267,8 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges {
             if ((this.typeHasSchema(this.property.type) && this.property instanceof PropertyDeclareAPIModel && 
                     (<PropertyDeclareAPIModel> this.property).input instanceof DerivedFEProperty) || this.compositionMap) {
                 if(this.isComplexType(this.property.schemaType) && !this.compositionMap){
-                    return (<PropertyDeclareAPIModel> this.property).input.type;
+                    let propertySchemaType = (<PropertyDeclareAPIModel> this.property).input.type;
+                    return propertySchemaType == PROPERTY_TYPES.MAP ? PROPERTY_TYPES.STRING : propertySchemaType;
                 }else{
                     return this.property.schema.property.type;
                 }
@@ -379,7 +380,9 @@ export class ToscaGetFunctionComponent implements OnInit, OnChanges {
         if (this.typeHasSchema(this.property.type)) {
             if ((this.property instanceof PropertyDeclareAPIModel && (<PropertyDeclareAPIModel> this.property).input instanceof DerivedFEProperty) || this.compositionMap) {
                 if(this.isComplexType(this.property.schemaType) && !this.compositionMap){
-                    return property.type === (<PropertyDeclareAPIModel> this.property).input.type;
+                    let propertySchemaType = (<PropertyDeclareAPIModel> this.property).input.type;
+                    propertySchemaType = propertySchemaType == PROPERTY_TYPES.MAP ? PROPERTY_TYPES.STRING : propertySchemaType;
+                    return property.type === propertySchemaType;
                 }else{
                     return property.type === this.property.schema.property.type;
                 }