diff --git a/Kernel/Include/Arch/Timer.h b/Kernel/Include/Arch/Timer.h
index eb93df6..3fbe2e4 100644
--- a/Kernel/Include/Arch/Timer.h
+++ b/Kernel/Include/Arch/Timer.h
@@ -2,7 +2,7 @@
 #include <Types.h>
 
 static const UInt64 kTimerFrequency = 1000; // 1ms
-static const UInt8 kTimerIRQ = 30;
+static const UInt8 kTimerIRQ = 27;
 
 void TimerInitialize();
 void TimerReset(UInt64 interval);
\ No newline at end of file
diff --git a/Kernel/Source/Arch/GIC.c b/Kernel/Source/Arch/GIC.c
index 732f096..c98326b 100644
--- a/Kernel/Source/Arch/GIC.c
+++ b/Kernel/Source/Arch/GIC.c
@@ -53,11 +53,13 @@ void GICCWriteEOIR(UInt32 irqID) {
 }
 
 void GICDispatch(ExceptionsType type) {
+    OSLog("GICDispatch: %d\n", type);
     if (type != ExceptionsIRQEl1h && type != ExceptionsIRQEl064) return;
     UInt32 irqID = GICCReadIAR() & 0x3FF;
     if (irqID == 1023) return; // spurious interrupt
 
-    if (irqID == 30) {
+    if (irqID == kTimerIRQ) {
+        OSLog("Timer IRQ\n");
         TimerReset(kTimerFrequency);
     }
 
diff --git a/Kernel/Source/Arch/Timer.c b/Kernel/Source/Arch/Timer.c
index 4967695..7d875f3 100644
--- a/Kernel/Source/Arch/Timer.c
+++ b/Kernel/Source/Arch/Timer.c
@@ -9,6 +9,6 @@ void TimerInitialize() {
 void TimerReset(UInt64 interval) {
     UInt64 frequency;
     __asm__ volatile ("mrs %0, cntfrq_el0" : "=r"(frequency));
-    __asm__ volatile ("msr cntp_tval_el0, %0" :: "r"(frequency /interval));
-    __asm__ volatile ("msr cntp_ctl_el0, %0" :: "r" (1));
+    __asm__ volatile ("msr cntv_tval_el0, %0" :: "r"(frequency /interval));
+    __asm__ volatile ("msr cntv_ctl_el0, %0" :: "r" (1));
 }