diff --git a/src/clockinator.S b/src/clockinator.S
index 5692360..0758838 100644
--- a/src/clockinator.S
+++ b/src/clockinator.S
@@ -46,8 +46,14 @@ main:
 
     ;ldi         r26,        60          ; Default BPM //TODO: save to eeprom not register, on runtime also ldi on r24 register
 
-    clr         r0
-    ldi         r1,         1
+    ; Setup general registers
+    ; 0
+    clr     r0
+    sts     timer0_overflow_count,  r0
+
+    ; 1
+    ldi     r16,    1
+    mov     r1,     r16
 
     rcall       timer0_set
     rcall       timer1_set