diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
index 297c790a7dd94a37e3e2fa2ae3e05ebb3407b4e4..3aba8060456e4534fe9272e005ea0917817efc8a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
@@ -68,19 +68,19 @@ public class SampleIdentifier extends SampleOwnerIdentifier
         this(instanceIdentifier, null, sampleCode);
     }
 
-    /** Group level {@link SampleIdentifier}. */
+    /** Space level {@link SampleIdentifier}. */
     public SampleIdentifier(final SpaceIdentifier spaceIdentifier, final String sampleCode)
     {
         this(null, spaceIdentifier, sampleCode);
     }
 
-    /** Group level {@link SampleIdentifier} in home database instance. */
+    /** Space level {@link SampleIdentifier} in home database instance. */
     public static SampleIdentifier create(String spaceCode, String sampleCode)
     {
         return new SampleIdentifier(new SpaceIdentifier(spaceCode), sampleCode);
     }
 
-    /** Home group level {@link SampleIdentifier} with type. */
+    /** Home space level {@link SampleIdentifier} with type. */
     public static SampleIdentifier createHomeGroup(final String sampleCode)
     {
         return new SampleIdentifier(SpaceIdentifier.createHome(), sampleCode);
@@ -133,7 +133,7 @@ public class SampleIdentifier extends SampleOwnerIdentifier
             }
         } else
         {
-            this.sampleSubCode = sampleCode;
+            this.sampleSubCode = null;
         }
     }