diff --git a/libsrc/cbm/wherex.s b/libsrc/cbm/wherex.s
index c7076ad84..b8f5e16d4 100644
--- a/libsrc/cbm/wherex.s
+++ b/libsrc/cbm/wherex.s
@@ -5,14 +5,12 @@
 ;
 
   	.export		_wherex
-        .import         PLOT
+        .import         CURS_X: zp
 
 
 .proc   _wherex
-  	sec
-  	jsr	PLOT		; Get cursor position
-  	tya
+        lda     CURS_X
         ldx     #$00
   	rts
 .endproc
-        
+
diff --git a/libsrc/cbm/wherey.s b/libsrc/cbm/wherey.s
index 869be4baf..53c5b4f6d 100644
--- a/libsrc/cbm/wherey.s
+++ b/libsrc/cbm/wherey.s
@@ -5,13 +5,11 @@
 ;
 
  	.export		_wherey
-        .import         PLOT
+        .import         CURS_Y: zp
 
 
 .proc   _wherey
-	sec
-	jsr	PLOT		; Get cursor position
-	txa
+        lda     CURS_Y
         ldx     #$00
 	rts
 .endproc