diff --git a/libsrc/cbm/filename.s b/libsrc/cbm/filename.s
index b458b8efb..284ea736d 100644
--- a/libsrc/cbm/filename.s
+++ b/libsrc/cbm/filename.s
@@ -144,13 +144,13 @@ drivedone:
 
 fncomplete:
 	pha	   		; Save mode
-        jsr     fnaddcomma      ; Add a comma
         lda     __filetype
-        jsr     fnadd           ; Add the type
+        jsr     fnaddmode       ; Add the type
         pla
 fnaddmode:
         pha
-        jsr     fnaddcomma
+        lda     #','
+        jsr     fnadd
         pla
 
 fnadd:  ldx     fnlen
@@ -158,10 +158,6 @@ fnadd:  ldx     fnlen
         sta     fnbuf,x
         rts
 
-fnaddcomma:
-        lda     #','
-        bne     fnadd
-
 ;--------------------------------------------------------------------------
 ; Data