diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 5b6f9f0..231bbb5 100644
Binary files a/emul/forth/z80c.bin and b/emul/forth/z80c.bin differ
diff --git a/forth/forth.asm b/forth/forth.asm
index e328f07..2eb3019 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -720,24 +720,10 @@ EMIT:
 	.dw	EXIT
 
 
-.fill 49
-
-	.db	"C,"
-	.dw	$-EMIT
-	.db	2
-CWR:
-	.dw	nativeWord
-	pop	de
-	call	chkPS
-	ld	hl, (HERE)
-	ld	(hl), e
-	inc	hl
-	ld	(HERE), hl
-	jp	next
-
+.fill 71
 
 	.db	","
-	.dw	$-CWR
+	.dw	$-EMIT
 	.db	1
 WR:
 	.dw	nativeWord
diff --git a/forth/icore.fs b/forth/icore.fs
index d5d36a1..ce69f11 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -81,6 +81,11 @@
     AGAIN
 ;
 
+: C,
+    HERE @ _c C!
+    HERE @ 1 + HERE !
+;
+
 : (entry)
     HERE @          ( h )
     WORD            ( h s )
@@ -92,7 +97,7 @@
     ( write prev value )
     HERE @ CURRENT @ _c - ,
     ( write size )
-    C,
+    _c C,
     HERE @ CURRENT !
 ;