diff --git a/libsrc/telestrat/initcwd.s b/libsrc/telestrat/initcwd.s
index 7d38dd563..dc3c53257 100644
--- a/libsrc/telestrat/initcwd.s
+++ b/libsrc/telestrat/initcwd.s
@@ -10,7 +10,8 @@
 
 
 initcwd:
-        BRK_TELEMON(XGETCWD)
+        ldx     #PWD_PTR
+        BRK_TELEMON XVARS
 
         sta     ptr1
         sty     ptr1+1
diff --git a/libsrc/telestrat/syschdir.s b/libsrc/telestrat/syschdir.s
index 2437ac80e..37ee0cc81 100644
--- a/libsrc/telestrat/syschdir.s
+++ b/libsrc/telestrat/syschdir.s
@@ -7,7 +7,6 @@
         .export         __syschdir
         .import         addysp, popax
 		.importzp       tmp1
-        .import         initcwd
 
         .include        "telestrat.inc"
         .include        "zeropage.inc"
@@ -28,7 +27,5 @@ __syschdir:
         ; Call telemon primitive
         
         BRK_TELEMON(XPUTCWD)
-
-        jsr     initcwd      ; Update cwd
         
         rts