diff --git a/DDExamples/CLICSiD/src/SiTrackerEndcap2_geo.cpp b/DDExamples/CLICSiD/src/SiTrackerEndcap2_geo.cpp
index 9707bd3969f6b723445c4f64d94bc3b566384a1c..983ca8f2d3946ae904106c16cbc60bdbe38d9175 100644
--- a/DDExamples/CLICSiD/src/SiTrackerEndcap2_geo.cpp
+++ b/DDExamples/CLICSiD/src/SiTrackerEndcap2_geo.cpp
@@ -22,7 +22,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens)  {
   string      det_name  = x_det.nameStr();
   bool        reflect   = x_det.reflect(false);
   DetElement  sdet        (det_name,det_id);
-  Assembly    assembly    (det_name);
+  Assembly    assembly    (det_name+"_assembly");
   Volume      motherVol = lcdd.pickMotherVolume(sdet);
   int         m_id=0, c_id=0, n_sensor=0;
   map<string,Volume> modules;
@@ -59,7 +59,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens)  {
       pv.addPhysVolID(_U(component),c_id);
       if ( c.isSensitive() ) {
 	sdet.check(n_sensor > 1,"SiTrackerEndcap2::fromCompact: "+c_name+" Max of 2 modules allowed!");
-	pv.addPhysVolID("sensor",c_id);
+	pv.addPhysVolID("sensor",n_sensor);
 	c_vol.setSensitiveDetector(sens);
 	++n_sensor;
       }