diff --git a/source/platform/platform.cpp b/source/platform/platform.cpp
index c68fb6773..c9faeb8cf 100644
--- a/source/platform/platform.cpp
+++ b/source/platform/platform.cpp
@@ -305,7 +305,8 @@ CNpcPlatform	*CNpcPlatform::Create(int Type)
 
 		case NPC_CART_PLATFORM:
 		{
-			platform = new ("cart platform") CNpcCartPlatform;
+			//platform = new ("cart platform") CNpcCartPlatform;
+			platform = new ("ghost train platform") CNpcGhostTrainPlatform;
 			break;
 		}
 
diff --git a/source/player/player.cpp b/source/player/player.cpp
index 981f2657f..af8524931 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -722,9 +722,9 @@ if(newmode!=-1)
 	platform=isOnPlatform();
 	if(platform)
 	{
-		if ( m_currentMode != PLAYER_MODE_CART && m_currentMode != PLAYER_MODE_DEAD )
+		if ( ( (CNpcPlatform *) platform )->isCart() )
 		{
-			if ( ( (CNpcPlatform *) platform )->isCart() )
+			if ( m_currentMode != PLAYER_MODE_CART && m_currentMode != PLAYER_MODE_DEAD )
 			{
 				setMode( PLAYER_MODE_CART );
 			}