--- a/TZTimestamp.st	Sat Jun 06 14:42:18 2015 +0200
+++ b/TZTimestamp.st	Sat Jun 06 14:42:27 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2014 by eXept Software AG
               All Rights Reserved
@@ -123,8 +125,8 @@
     |ti|
 
     "/ utcOffset negative: east of GMT
-    ti := OperatingSystem computeUTCTimeAndDateFrom:(osTime - (utcOffset * 1000)).
-    ti utcOffset:utcOffset.
+    ti := OperatingSystem computeUTCTimeAndDateFrom:(osTime - ((utcOffset ? 0) * 1000)).
+    ti utcOffset:(utcOffset ? 0).
     ^ ti
 !
 
@@ -138,7 +140,7 @@
      If utcOffset is negative, the local timezone is east of Greenwich.
      If utcOffset is positive, the local timezone is west of Greenwich."
 
-    ^  utcOffset
+    ^ utcOffset ? 0
 !
 
 utcOffset:seconds
@@ -195,10 +197,10 @@
 !TZTimestamp class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/TZTimestamp.st,v 1.11 2015-06-06 11:59:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/TZTimestamp.st,v 1.12 2015-06-06 12:42:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/TZTimestamp.st,v 1.11 2015-06-06 11:59:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/TZTimestamp.st,v 1.12 2015-06-06 12:42:27 cg Exp $'
 ! !