diff --git a/libsrc/cbm/initcwd.s b/libsrc/cbm/initcwd.s
index d5e5b9296..7064c16e1 100644
--- a/libsrc/cbm/initcwd.s
+++ b/libsrc/cbm/initcwd.s
@@ -9,8 +9,6 @@
         .import         pusha0, tosudiva0
         .importzp       sreg, ptr1, ptr2
 
-        .macpack        generic
-
 initcwd:
         lda     #<__cwd
         ldx     #>__cwd
@@ -27,15 +25,20 @@ devicestr:
         lda     #10
         jsr     tosudiva0
         ldy     #0
-        lda     sreg
-        beq     @L0             ; >=10
-        add     #'0'
+        tax                     ; result of the division (lsb)
+        beq     @L0             ; < 10
+
+        clc
+        adc     #'0'
         sta     (ptr2),y
         iny
-@L0:    lda     ptr1            ; rem
-        add     #'0'
+@L0:
+        lda     sreg            ; reminder of the division
+        clc
+        adc     #'0'
         sta     (ptr2),y
         iny
-        lda     #0
+
+        lda     #0              ; terminating 0
         sta     (ptr2),y
         rts