diff --git a/gamedir/Data-1.13/Scripts/Overhead.lua b/gamedir/Data-1.13/Scripts/Overhead.lua
index cc5fb3f3c..e043969f5 100644
--- a/gamedir/Data-1.13/Scripts/Overhead.lua
+++ b/gamedir/Data-1.13/Scripts/Overhead.lua
@@ -250,8 +250,9 @@ function HandleAtNewGridNo( ProfileId )
 					SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER )
 					TriggerNPCRecord( Profil.SKYRIDER, 15 )
 					SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER, 163 ) -- 163 helicopter
-							
-			elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then
+			
+			-- Mary & John				
+			elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true ) ) then
 					
 					-- Mary	
 					if ( ProfileId == Profil.MARY ) then
diff --git a/gamedir/Data-UB/Scripts/Overhead.lua b/gamedir/Data-UB/Scripts/Overhead.lua
index 8129cc704..6466375de 100644
--- a/gamedir/Data-UB/Scripts/Overhead.lua
+++ b/gamedir/Data-UB/Scripts/Overhead.lua
@@ -251,8 +251,9 @@ function HandleAtNewGridNo( ProfileId )
 					SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER )
 					TriggerNPCRecord( Profil.SKYRIDER, 15 )
 					SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER )
-							
-			elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then
+			
+			-- Marie & John
+			elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true
 					
 					-- Mary	
 					if ( ProfileId == Profil.MARY ) then
diff --git a/gamedir/Data/Scripts/Overhead.lua b/gamedir/Data/Scripts/Overhead.lua
index dfc3208dd..57bb5fa80 100644
--- a/gamedir/Data/Scripts/Overhead.lua
+++ b/gamedir/Data/Scripts/Overhead.lua
@@ -250,8 +250,9 @@ function HandleAtNewGridNo( ProfileId )
 					SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER )
 					TriggerNPCRecord( Profil.SKYRIDER, 15 )
 					SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER, 163 ) -- 163 helicopter
-							
-			elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then
+			
+			-- Mary & John
+			elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true ) ) then
 					
 					-- Mary	
 					if ( ProfileId == Profil.MARY ) then