diff --git a/src/DETHRACE/common/graphics.c b/src/DETHRACE/common/graphics.c
index 4f27b6f8..7e7b397c 100644
--- a/src/DETHRACE/common/graphics.c
+++ b/src/DETHRACE/common/graphics.c
@@ -2072,11 +2072,13 @@ void RenderAFrame(int pDepth_mask_on) {
         if (gVoodoo_rush_mode >= 1) {
             gRearview_screen->pixels = gBack_screen->pixels;
         }
+
+#ifdef DETHRACE_FIX_BUGS
+        gRearview_screen->base_x = MAX(0, gScreen_wobble_x + gProgram_state.current_car.mirror_left);
+        gRearview_screen->base_y = MAX(0, gScreen_wobble_y + gProgram_state.current_car.mirror_top);
+#else
         gRearview_screen->base_x = gScreen_wobble_x + gProgram_state.current_car.mirror_left;
         gRearview_screen->base_y = gScreen_wobble_y + gProgram_state.current_car.mirror_top;
-#ifdef DETHRACE_FIX_BUGS
-        gRearview_screen->base_x = MAX(0, gRearview_screen->base_x);
-        gRearview_screen->base_y = MAX(0, gRearview_screen->base_y);
 #endif
 
 #endif