--- a/BooleanBlockValue.st	Tue Jan 03 10:43:01 2017 +0100
+++ b/BooleanBlockValue.st	Tue Jan 03 10:48:21 2017 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview2' }"
 
+"{ NameSpace: Smalltalk }"
+
 BlockValue subclass:#BooleanBlockValue
 	instanceVariableNames:''
 	classVariableNames:''
@@ -39,7 +41,7 @@
 & anotherBooleanValueHolder
     "return another valueHolder, which returns the logical and of myself and another valueHolder"
 
-    ^ BooleanBlockValue 
+    ^ self class 
         forLogical:self and:anotherBooleanValueHolder
 
     "
@@ -59,7 +61,7 @@
 logicalNot
     "return another valueHolder, which returns the logical not of myself"
 
-    ^ BooleanBlockValue forLogicalNot:self.
+    ^ self class forLogicalNot:self.
 
     "
      |b nb|
@@ -76,7 +78,7 @@
 | anotherBooleanValueHolder
     "return another valueHolder, which returns the logical or of myself and another valueHolder"
 
-    ^ BooleanBlockValue 
+    ^ self class 
         forLogical:self or:anotherBooleanValueHolder
 
     "
@@ -98,10 +100,10 @@
 !BooleanBlockValue class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/BooleanBlockValue.st,v 1.4 2013-07-27 08:09:59 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/BooleanBlockValue.st,v 1.4 2013-07-27 08:09:59 cg Exp $'
+    ^ '$Header$'
 ! !