diff --git a/Atari/textproc.asm b/Atari/textproc.asm
index 70baf80..79bae28 100644
--- a/Atari/textproc.asm
+++ b/Atari/textproc.asm
@@ -1279,10 +1279,12 @@ MakeDefaultName
 @   lda (temp2),y
     and #$7f    ; remove inverse
     sta tanksnames,x
+    beq MakeNumber  ; first space found :)
     inx
     iny
     cpy #8
     bne @-
+MakeNumber
     ldy tanknr
     lda digits+1,y
     sta tanksnames,x
diff --git a/C64/textproc.asm b/C64/textproc.asm
index 57253e7..8998e1f 100644
--- a/C64/textproc.asm
+++ b/C64/textproc.asm
@@ -201,10 +201,12 @@ MakeDefaultName
 @   lda (temp2),y
     and #$7f    ; remove inverse
     sta tanksnames,x
+    beq MakeNumber  ; first space found :)
     inx
     iny
     cpy #8
     bne @-
+MakeNumber
     ldy tanknr
     lda digits+1,y
     sta tanksnames,x
diff --git a/scorch.bin b/scorch.bin
index 4d4b35e..6e32304 100644
Binary files a/scorch.bin and b/scorch.bin differ
diff --git a/scorch.xex b/scorch.xex
index 8725a75..ee4dd14 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/scorchC64.prg b/scorchC64.prg
index 039e948..6e8e552 100644
Binary files a/scorchC64.prg and b/scorchC64.prg differ