diff --git a/src/CP15.cpp b/src/CP15.cpp
index bcbfbb24..db1c67ea 100644
--- a/src/CP15.cpp
+++ b/src/CP15.cpp
@@ -814,12 +814,9 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
 
     if ((addr >> 24) == 0x02)
     {
-        if (NDS.ARM9Timestamp < MainRAMTimestamp) NDS.ARM9Timestamp = MainRAMTimestamp;
-
-        if (DataRegion == Mem9_MainRAM) NDS.ARM9Timestamp += CodeCycles;
+        if (NDS.ARM9Timestamp < MainRAMTimestamp) NDS.ARM9Timestamp = MainRAMTimestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
     }
-
-    if (NDS.ARM9Regions[addr>>14] == DataRegion && Store) NDS.ARM9Timestamp += (1<<NDS.ARM9ClockShift);
+    else if (NDS.ARM9Regions[addr>>14] == DataRegion && Store) NDS.ARM9Timestamp += (1<<NDS.ARM9ClockShift);
     
     NDS.ARM9Timestamp += CodeCycles;
     if (NDS.ARM9Timestamp < TimestampActual) NDS.ARM9Timestamp = TimestampActual;