diff --git a/Source Code/Events_Core.bb b/Source Code/Events_Core.bb
index f11e2b50d..30a576658 100644
--- a/Source Code/Events_Core.bb	
+++ b/Source Code/Events_Core.bb	
@@ -6000,13 +6000,22 @@ Function UpdateEvents%()
 				;[Block]
 				If PlayerRoom = e\room Then
 					If e\EventState = 0.0 Then
-						For i = 0 To 1
-							CreateNPC(NPCType966, EntityX(e\room\Objects[i], True), EntityY(e\room\Objects[i], True), EntityZ(e\room\Objects[i], True))
-						Next
-						
-						e\EventState = 1.0
-						
-						RemoveEvent(e)
+						If RemoteDoorOn Then
+							me\LightBlink = 4.0
+							For i = 0 To 1
+								e\room\RoomDoors[i]\SoundCHN = PlaySound2(LoadTempSound("SFX\Door\DoorSparks.ogg"), Camera, e\room\RoomDoors[i]\OBJ)
+								e\room\RoomDoors[i]\Open = True
+							Next
+						EndIf
+						If e\room\RoomDoors[0]\Open = True Lor e\room\RoomDoors[1]\Open = True Then
+							For i = 0 To 1
+								CreateNPC(NPCType966, EntityX(e\room\Objects[i], True), EntityY(e\room\Objects[i], True), EntityZ(e\room\Objects[i], True))
+							Next
+							
+							e\EventState = 1.0
+							
+							RemoveEvent(e)
+						EndIf
 					EndIf
 				EndIf
 				;[End Block]
diff --git a/Source Code/Map_Core.bb b/Source Code/Map_Core.bb
index a65654792..c1fe13943 100644
--- a/Source Code/Map_Core.bb	
+++ b/Source Code/Map_Core.bb	
@@ -5068,9 +5068,9 @@ Function FillRoom%(r.Rooms)
 			;[End Block]
 		Case "cont3_966"
 			;[Block]
-			d.Doors = CreateDoor(r\x - 400.0 * RoomScale, r\y, r\z, -90.0, r, False, DEFAULT_DOOR, KEY_CARD_3)
+			r\RoomDoors.Doors[0] = CreateDoor(r\x - 400.0 * RoomScale, r\y, r\z, -90.0, r, False, DEFAULT_DOOR, KEY_CARD_3)
 			
-			d.Doors = CreateDoor(r\x, r\y, r\z - 480.0 * RoomScale, 180.0, r, False, DEFAULT_DOOR, KEY_CARD_3)
+			r\RoomDoors.Doors[1] = CreateDoor(r\x, r\y, r\z - 480.0 * RoomScale, 180.0, r, False, DEFAULT_DOOR, KEY_CARD_3)
 			
 			r\Objects[0] = CreatePivot()
 			PositionEntity(r\Objects[0], r\x, r\y + 0.5, r\z + 512.0 * RoomScale)