diff --git a/libsrc/c128/waitvsync.s b/libsrc/c128/waitvsync.s
index e4bbbf7c9..573f574a7 100644
--- a/libsrc/c128/waitvsync.s
+++ b/libsrc/c128/waitvsync.s
@@ -23,8 +23,8 @@ _waitvsync:
 
 @c80:
         ;FIXME: do we have to switch banks?
+        lda     #$20
 @l3:
-        lda     VDC_INDEX
-        and     #$20
+        and     VDC_INDEX
         beq     @l3
         rts
diff --git a/libsrc/pet/waitvsync.s b/libsrc/pet/waitvsync.s
index 39b562e43..d74f76c9f 100644
--- a/libsrc/pet/waitvsync.s
+++ b/libsrc/pet/waitvsync.s
@@ -9,8 +9,7 @@
         .include        "pet.inc"
 
 _waitvsync:
-@l1:
-        lda     VIA_PB
-        and     #%00100000
-        bne     @l1
+        lda     #%00100000
+:       and     VIA_PB
+        bne     :-
         rts