diff --git a/src/video/vid_8514a.c b/src/video/vid_8514a.c
index d2e7efd8b..470642884 100644
--- a/src/video/vid_8514a.c
+++ b/src/video/vid_8514a.c
@@ -432,6 +432,14 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
             if (len == 2) {
                 dev->accel.short_stroke = val;
 
+                dev->accel.cx = dev->accel.cur_x;
+                if (dev->accel.cur_x >= 0x600)
+                    dev->accel.cx |= ~0x5ff;
+
+                dev->accel.cy = dev->accel.cur_y;
+                if (dev->accel.cur_y >= 0x600)
+                    dev->accel.cy |= ~0x5ff;
+
                 if (dev->accel.cmd & 0x1000) {
                     ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke & 0xff, len);
                     ibm8514_short_stroke_start(-1, 0, -1, 0, svga, dev->accel.short_stroke >> 8, len);
@@ -1139,16 +1147,8 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
       the NOP command)*/
     switch (cmd) {
         case 0: /*NOP (Short Stroke Vectors)*/
-            if (dev->accel.ssv_state == 0) {
-                dev->accel.cx = dev->accel.cur_x;
-                if (dev->accel.cur_x >= 0x600)
-                    dev->accel.cx |= ~0x5ff;
-
-                dev->accel.cy = dev->accel.cur_y;
-                if (dev->accel.cur_y >= 0x600)
-                    dev->accel.cy |= ~0x5ff;
+            if (dev->accel.ssv_state == 0)
                 break;
-            }
 
             if (dev->accel.cmd & 0x08) {
                 while (count-- && dev->accel.ssv_len >= 0) {
diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c
index bb5c283ad..7839a602a 100644
--- a/src/video/vid_s3.c
+++ b/src/video/vid_s3.c
@@ -923,6 +923,9 @@ s3_accel_out_fifo(s3_t *s3, uint16_t port, uint8_t val)
             s3->accel.short_stroke = (s3->accel.short_stroke & 0xff) | (val << 8);
             s3->accel.ssv_state    = 1;
 
+            s3->accel.cx = s3->accel.cur_x & 0xfff;
+            s3->accel.cy = s3->accel.cur_y & 0xfff;
+
             if (s3->accel.cmd & 0x1000) {
                 s3_short_stroke_start(s3, s3->accel.short_stroke & 0xff);
                 s3_short_stroke_start(s3, s3->accel.short_stroke >> 8);
@@ -1785,6 +1788,9 @@ s3_accel_out_fifo_w(s3_t *s3, uint16_t port, uint16_t val)
         s3->accel.short_stroke = val;
         s3->accel.ssv_state    = 1;
 
+        s3->accel.cx = s3->accel.cur_x & 0xfff;
+        s3->accel.cy = s3->accel.cur_y & 0xfff;
+
         if (s3->accel.cmd & 0x1000) {
             s3_short_stroke_start(s3, s3->accel.short_stroke & 0xff);
             s3_short_stroke_start(s3, s3->accel.short_stroke >> 8);
@@ -7861,7 +7867,7 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
     uint32_t  srcbase;
     uint32_t  dstbase;
 
-    if ((s3->chip >= S3_TRIO64 || s3->chip == S3_VISION968 || s3->chip == S3_VISION868) && (s3->accel.cmd & (1 << 11)))
+    if (((s3->chip >= S3_TRIO64) || (s3->chip == S3_VISION968) || (s3->chip == S3_VISION868)) && (s3->accel.cmd & (1 << 11)))
         cmd |= 0x08;
 
     // SRC-BASE/DST-BASE
@@ -7970,11 +7976,8 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, voi
 
     switch (cmd) {
         case 0: /*NOP (Short Stroke Vectors)*/
-            if (s3->accel.ssv_state == 0) {
-                s3->accel.cx = s3->accel.cur_x & 0xfff;
-                s3->accel.cy = s3->accel.cur_y & 0xfff;
+            if (s3->accel.ssv_state == 0)
                 break;
-            }
 
             if (s3->accel.cmd & 0x08) { /*Radial*/
                 while (count-- && s3->accel.ssv_len >= 0) {