diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index f84f8f8bd..d70d5f419 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -94,7 +94,7 @@ void Camera::changeCamera(unsigned int camera_index, CameraType type)
     if(old_camera->getType()==type) return;
 
     Camera *new_camera = createCamera(old_camera->getIndex(), type,
-                                      old_camera->m_kart            );
+                                      old_camera->m_original_kart);
     // Replace the previous camera
     m_all_cameras[camera_index] = new_camera;
     if(s_active_camera == old_camera)
diff --git a/src/modes/follow_the_leader.cpp b/src/modes/follow_the_leader.cpp
index e8f0303d7..06cf0b461 100644
--- a/src/modes/follow_the_leader.cpp
+++ b/src/modes/follow_the_leader.cpp
@@ -85,19 +85,6 @@ void FollowTheLeaderRace::reset()
     WorldStatus::setClockMode(WorldStatus::CLOCK_COUNTDOWN,
                               m_leader_intervals[0]);
     
-    const unsigned int kart_amount = (unsigned int)m_karts.size();
-    int idCamera = 0;
-    for (unsigned int n = 1; n < kart_amount; n++)
-    {
-        if (m_karts[n]->getController()->isPlayerController())
-        {
-            Camera *camera = Camera::getCamera(idCamera);
-            camera->setMode(Camera::CM_NORMAL);
-            camera->setKart(getKart(n));
-            idCamera++;
-        }
-    }
-
     m_is_over_delay = 2.0f;
 }   // reset
 
diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp
index 3297723b7..edb21c57f 100644
--- a/src/modes/three_strikes_battle.cpp
+++ b/src/modes/three_strikes_battle.cpp
@@ -118,13 +118,6 @@ void ThreeStrikesBattle::reset()
         // no positions in this mode
         m_karts[n]->setPosition(-1);
 
-        if (m_karts[n]->getController()->isPlayerController())
-        {
-            Camera *camera = Camera::getCamera(idCamera);
-            camera->setKart(m_karts[n]);
-            idCamera++;
-        }
-
         scene::ISceneNode* kart_node = m_karts[n]->getNode();
 
         core::list<scene::ISceneNode*>& children = kart_node->getChildren();