diff --git a/Homework/Homework6/Homework6.ino b/Homework/Homework6/Homework6.ino
index 007484e..51ad2b6 100644
--- a/Homework/Homework6/Homework6.ino
+++ b/Homework/Homework6/Homework6.ino
@@ -81,7 +81,12 @@ void drawOLED() {
     u8g.drawFrame(0, (OLED_HEIGHT - PROGESS_BAR_HEIGHT) / 2, OLED_WIDTH,
                   PROGESS_BAR_HEIGHT);
     u8g.drawBox(2, (OLED_HEIGHT - PROGESS_BAR_HEIGHT) / 2 + 2,
-                (OLED_WIDTH - 4) * goal_step / MAX_GOAL_STEP,
+                (OLED_WIDTH - 4) *
+                    (current_step < 0
+                         ? 0
+                         : (current_step > MAX_GOAL_STEP ? MAX_GOAL_STEP
+                                                         : current_step)) /
+                    MAX_GOAL_STEP,
                 PROGESS_BAR_HEIGHT - 4);
   } while (u8g.nextPage());
 }