diff --git a/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st b/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st
index 41e2b820..6cfcd346 100644
--- a/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st
+++ b/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st
@@ -4,4 +4,10 @@ nextPutAll: aString
 
   binary
     ifTrue: [ stream nextPutAll: aString asString ]
-    ifFalse: [ stream nextPutAll: aString encodeAsUTF8intoString ]
\ No newline at end of file
+    ifFalse: [ 
+      aString size > 8
+        ifTrue: [ stream nextPutAll: (aString encodeAsUTF8 changeClassTo: String) ]
+        ifFalse: [ 
+          | str |
+          str := aString encodeAsUTF8intoString.
+          stream nextPutAll: str ] ]
\ No newline at end of file
diff --git a/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/methodProperties.json b/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/methodProperties.json
index b404fc4f..a9cb74d0 100644
--- a/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/methodProperties.json
+++ b/repository/Grease-GemStone300-Core.package/GRUtf8CodecStream.class/methodProperties.json
@@ -1,9 +1,9 @@
 {
 	"class" : {
-		"initialize" : "dkh 06/15/2015 10:48" },
+		"initialize" : "dkh 06/15/2015 15:15" },
 	"instance" : {
 		"crlf" : "dkh 11/06/2009 08:45",
 		"invalidUtf8" : "dkh 11/06/2009 08:45",
 		"next:" : "DaleHenrichs 08/27/2010 10:45",
 		"nextPut:" : "dkh 06/15/2015 10:44",
-		"nextPutAll:" : "dkh 06/19/2015 13:21" } }
+		"nextPutAll:" : "dkh 06/15/2015 10:45" } }
diff --git a/repository/Grease-GemStone300-Core.package/monticello.meta/version b/repository/Grease-GemStone300-Core.package/monticello.meta/version
index 6036ac13..b662e285 100644
--- a/repository/Grease-GemStone300-Core.package/monticello.meta/version
+++ b/repository/Grease-GemStone300-Core.package/monticello.meta/version
@@ -1 +1 @@
-(name 'Grease-GemStone300-Core-dkh.8' message 'Better version of GRUtf8CodecStream>>nextPutAll: ' id '40c0ba9d-f7e0-41a7-a3d6-3cc037b012fa' date '06/19/2015' time '13:22:46' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-dkh.7' message 'restore GRUtf8CodecStream class>>initialize as part fix for https://github.com/GsDevKit/GsDevKit/issues/27 ... will have to wait until backport to GLASS 1.0-beta9.2.1 is completed ...' id '8be8bc71-c4c5-4c56-8ab3-5301389fe266' date '06/15/2015' time '15:17:22' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-dkh.6' message 'Missed some spots in Grease relating to the fix for https://github.com/GsDevKit/GsDevKit/issues/27' id 'af0b39f3-714b-4b01-9c72-7536a3c128e8' date '06/15/2015' time '10:56:56' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-JohanBrichau.5' message 'Fix for slow handling of utf8 encoding in GS3.x (see https://github.com/GsDevKit/Grease/issues/2 )' id 'a1323a4e-ce99-4e85-bf25-ffeaaa9463f5' date '10/19/2014' time '08:40:18' author 'JohanBrichau' ancestors ((name 'Grease-GemStone300-Core-dkh.4' message '1.0.6.1 (dkh.159):
- GemStone 3.0.1 fix for Issue 130: remote breakpoints don''''t work
  http://code.google.com/p/glassdb/issues/detail?id=130' id '5c8d2bf0-4319-4099-b4b1-83abcc7195b0' date '10/14/2011' time '17:52:12' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-dkh.3' message '1.0.6.1 (dkh.159):
- port to GemStone 3.0.1 (#generatehardBreak changed for 3.0)' id '2c389d30-c4d2-4def-b488-82d82b241d1d' date '10/14/2011' time '17:04:58' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-DaleHenrichs.2' message '- pick up some missing methods' id 'a36f8f57-31fc-4a76-84d8-d68331d70935' date '07/22/1910' time '16:42:48' author 'DaleHenrichs' ancestors ((name 'Grease-GemStone300-Core-DaleHenrichs.1' message '- Exception>>greaseString is gemstone version specific' id '0a2c8aaf-061e-45b6-8070-54e4b203adf3' date '07/22/1910' time '14:18:53' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
\ No newline at end of file
+(name 'Grease-GemStone300-Core-dkh.7' message 'restore GRUtf8CodecStream class>>initialize as part fix for https://github.com/GsDevKit/GsDevKit/issues/27 ... will have to wait until backport to GLASS 1.0-beta9.2.1 is completed ...' id '8be8bc71-c4c5-4c56-8ab3-5301389fe266' date '06/15/2015' time '15:17:22' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-dkh.6' message 'Missed some spots in Grease relating to the fix for https://github.com/GsDevKit/GsDevKit/issues/27' id 'af0b39f3-714b-4b01-9c72-7536a3c128e8' date '06/15/2015' time '10:56:56' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-JohanBrichau.5' message 'Fix for slow handling of utf8 encoding in GS3.x (see https://github.com/GsDevKit/Grease/issues/2 )' id 'a1323a4e-ce99-4e85-bf25-ffeaaa9463f5' date '10/19/2014' time '08:40:18' author 'JohanBrichau' ancestors ((name 'Grease-GemStone300-Core-dkh.4' message '1.0.6.1 (dkh.159):
- GemStone 3.0.1 fix for Issue 130: remote breakpoints don''''t work
  http://code.google.com/p/glassdb/issues/detail?id=130' id '5c8d2bf0-4319-4099-b4b1-83abcc7195b0' date '10/14/2011' time '17:52:12' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-dkh.3' message '1.0.6.1 (dkh.159):
- port to GemStone 3.0.1 (#generatehardBreak changed for 3.0)' id '2c389d30-c4d2-4def-b488-82d82b241d1d' date '10/14/2011' time '17:04:58' author 'dkh' ancestors ((name 'Grease-GemStone300-Core-DaleHenrichs.2' message '- pick up some missing methods' id 'a36f8f57-31fc-4a76-84d8-d68331d70935' date '07/22/1910' time '16:42:48' author 'DaleHenrichs' ancestors ((name 'Grease-GemStone300-Core-DaleHenrichs.1' message '- Exception>>greaseString is gemstone version specific' id '0a2c8aaf-061e-45b6-8070-54e4b203adf3' date '07/22/1910' time '14:18:53' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
\ No newline at end of file