diff --git a/gamedir/Data-1.13/Scripts/HourlyUpdate.lua b/gamedir/Data-1.13/Scripts/HourlyUpdate.lua
index 1ceb6483f..974b1ee7e 100644
--- a/gamedir/Data-1.13/Scripts/HourlyUpdate.lua
+++ b/gamedir/Data-1.13/Scripts/HourlyUpdate.lua
@@ -17,13 +17,13 @@ function HourlyQuestUpdate()
 	end
 
 	-- Bar/night club
-	if ( cHour > 15 or cHour < 2) then
+	if ( cHour >= 15 or cHour < 2) then
 	
 		SetFactTrue( Facts.FACT_CLUB_OPEN )
 		SetFactFalse( Facts.FACT_PAST_CLUB_CLOSING_AND_PLAYER_WARNED )
 
 		-- Reset boxes fought
-		for i = 0,3 do
+		for i = 0,2 do
 			-- Set false
 			gfBoxerFought(i,false)
 		end
diff --git a/gamedir/Data/NPCData/087.npc b/gamedir/Data/NPCData/087.npc
new file mode 100644
index 000000000..9cf86b816
Binary files /dev/null and b/gamedir/Data/NPCData/087.npc differ
diff --git a/gamedir/Data/Scripts/HourlyUpdate.lua b/gamedir/Data/Scripts/HourlyUpdate.lua
index 1ceb6483f..974b1ee7e 100644
--- a/gamedir/Data/Scripts/HourlyUpdate.lua
+++ b/gamedir/Data/Scripts/HourlyUpdate.lua
@@ -17,13 +17,13 @@ function HourlyQuestUpdate()
 	end
 
 	-- Bar/night club
-	if ( cHour > 15 or cHour < 2) then
+	if ( cHour >= 15 or cHour < 2) then
 	
 		SetFactTrue( Facts.FACT_CLUB_OPEN )
 		SetFactFalse( Facts.FACT_PAST_CLUB_CLOSING_AND_PLAYER_WARNED )
 
 		-- Reset boxes fought
-		for i = 0,3 do
+		for i = 0,2 do
 			-- Set false
 			gfBoxerFought(i,false)
 		end