diff --git a/kratos.gid/apps/Fluid/write/writeProjectParameters.tcl b/kratos.gid/apps/Fluid/write/writeProjectParameters.tcl
index a80ad0764..ff5486616 100644
--- a/kratos.gid/apps/Fluid/write/writeProjectParameters.tcl
+++ b/kratos.gid/apps/Fluid/write/writeProjectParameters.tcl
@@ -257,6 +257,7 @@ proc ::Fluid::write::getBoundaryConditionMeshId {} {
                     set groupName "_HIDDEN_$condition_name"
                     if {$groupName ni $listOfBCGroups} {lappend listOfBCGroups $groupName}
                 } else {
+                    set groupName [::write::getSubModelPartId $cid $groupName]
                     if {$groupName ni $listOfBCGroups} {lappend listOfBCGroups $groupName}
                 }
             } else {
@@ -287,6 +288,7 @@ proc ::Fluid::write::getNoSkinConditionMeshId {} {
         set groupName [$dragGroup @n]
         set groupName [write::GetWriteGroupName $groupName]
         if {[GetAttribute write_mdpa_mode] eq "geometries"} {
+            set groupName [::write::getSubModelPartId $cid $groupName]
             if {$groupName ni $listOfNoSkinGroups} {lappend listOfNoSkinGroups $groupName}
         } else {
             set cid [[$dragGroup parent] @n]
diff --git a/kratos.gid/scripts/Writing/WriteProjectParameters.tcl b/kratos.gid/scripts/Writing/WriteProjectParameters.tcl
index c129c3f8f..c6d6da54c 100644
--- a/kratos.gid/scripts/Writing/WriteProjectParameters.tcl
+++ b/kratos.gid/scripts/Writing/WriteProjectParameters.tcl
@@ -256,11 +256,8 @@ proc write::getConditionsParametersDict {un {condition_type "Condition"}} {
         set groupName [$group @n]
         set cid [[$group parent] @n]
         set groupName [write::GetWriteGroupName $groupName]
-        if {[GetConfigurationAttribute write_mdpa_mode] eq "geometries"} {
-            set groupId $groupName
-        } else {
-            set groupId [::write::getSubModelPartId $cid $groupName]
-        }
+        set groupId [::write::getSubModelPartId $cid $groupName]
+       
         set grouping_by ""
         if {$condition_type eq "Condition"} {
             set condition [::Model::getCondition $cid]
diff --git a/kratos.gid/scripts/Writing/WriteSubModelPart.tcl b/kratos.gid/scripts/Writing/WriteSubModelPart.tcl
index b921a2556..90174cd51 100644
--- a/kratos.gid/scripts/Writing/WriteSubModelPart.tcl
+++ b/kratos.gid/scripts/Writing/WriteSubModelPart.tcl
@@ -250,7 +250,9 @@ proc write::getSubModelPartId {cid group} {
     if { [GetConfigurationAttribute write_mdpa_mode] eq "geometries"} {
         # variable geometry_cnd_name
         # set cid $geometry_cnd_name
-        return [write::GetWriteGroupName $group]
+        set name [write::GetWriteGroupName $group]
+        set good_name [write::transformGroupName $name]
+        return $good_name
     }
     set find [list $cid ${group}]
     if {[dict exists $submodelparts $find]} {