From 15ca7707dd16acf509def254bc61ad2689722ac7 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Thu, 3 Feb 2022 18:34:59 +0300
Subject: [PATCH] [bos #28855] EDF 24963 - multi-explode.

---
 src/GEOMClient/GEOM_Client.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index fe12c4482..53f92b453 100644
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -254,9 +254,10 @@ TopoDS_Shape GEOM_Client::GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_p
     subShapes.insert( subShapes.end(), anIndices.cbegin(), anIndices.cend() );
   }
 
-  /* Case of only one subshape */
-  if ( list->length() == 1 && list[0] > 1 ) {
-    S = subShapes[list[0]-1];
+  /* Case of only one subshape, excluding groups of one main shape */
+  if ( list->length() == 1 && !(aShape->GetType() == 37 && list[0] == 1) ) {
+    if (list[0] > 0)
+      S = subShapes[list[0]-1];
   }
   else {
     BRep_Builder B;
-- 
2.39.2