diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 79331e8..c1f7c24 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF
 db #$00 ; expand file to 2mb
 
 org $1FFFF8 ; <- FFFF8 timestamp rom
-db #$20, #$18, #$03, #$12 ; year/month/day
+db #$20, #$18, #$03, #$16 ; year/month/day
 
 ;================================================================================
 
diff --git a/timer.asm b/timer.asm
index 970acf0..82dfd89 100644
--- a/timer.asm
+++ b/timer.asm
@@ -4,6 +4,7 @@
 !Temp = "$7F5020"
 !BaseTimer = "$7EF43E"
 !ChallengeTimer = "$7EF454"
+!TemporaryOHKO = "$7F50CC"
 ;--------------------------------------------------------------------------------
 !CLOCK_HOURS = "$7F5080" ; $7F5080 - $7F5083 - Clock Hours
 !CLOCK_MINUTES = "$7F5084" ; $7F5084 - $7F5087 - Clock Minutes
@@ -158,8 +159,10 @@ DrawChallengeTimer:
 RTL
 ;--------------------------------------------------------------------------------
 OHKOTimer:
+	LDA !TemporaryOHKO : BNE .kill
 	LDA.l TimeoutBehavior : CMP #$02 : BNE +
-	LDA.l !Status : AND.b #$02 : BEQ +
+	LDA !Status : AND.b #$02 : BEQ +
+		.kill
 		LDA.b #$00 : STA $7EF36D ; kill link
 	+
 	LDA $7EF36D