diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index e3ca0c34d..da2a98a9c 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -130,8 +130,6 @@ void SpinnerWidget::add()
     m_children[2].m_event_handler = this;
     m_children[2].m_properties[PROP_ID] = "right";
     m_children[2].id = m_children[2].m_element->getID();
-    
-    std::cout << "Adding spinner with m_event_handler=" << m_event_handler << std::endl;
 }
 
 void SpinnerWidget::move(const int x, const int y, const int w, const int h)
diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index e1fbba5f3..537c7601b 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -167,6 +167,7 @@ void RaceManager::setTrack(const std::string& track)
 void RaceManager::computeRandomKartList()
 {
     int n = m_num_karts - m_player_karts.size();
+    std::cout << "AI karts count = " << n << " for m_num_karts=" << m_num_karts << " and m_player_karts.size()=" << m_player_karts.size() << std::endl;
     // If less kart selected than there are player karts, adjust the number of
     // karts to the minimum
     if(n<0)
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index a1adfc1e2..dc2a95de4 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -630,11 +630,6 @@ void menuEventKarts(Widget* widget, const std::string& name)
         }
         std::cout << "==========\n";
         
-        std::cout << "Calling setNumKarts(" << race_manager->getNumKarts() << " AIs + " << players.size() << " players = " <<
-                race_manager->getNumKarts() + players.size() << ")\n";
-                race_manager->setNumKarts( race_manager->getNumKarts() + players.size() ); // FIXME : doesn't work. add AI karts
-        
-        std::cout << "Calling setNumPlayers(" << players.size() << ")\n";
         race_manager->setNumPlayers( players.size() );
         race_manager->setNumLocalPlayers( players.size() );
         
diff --git a/src/states_screens/state_manager.cpp b/src/states_screens/state_manager.cpp
index 64deb5547..977444690 100644
--- a/src/states_screens/state_manager.cpp
+++ b/src/states_screens/state_manager.cpp
@@ -193,7 +193,7 @@ void StateManager::menuEventRaceSetup(Widget* widget, const std::string& name)
     {
         SpinnerWidget* w = dynamic_cast<SpinnerWidget*>(widget);
         
-        race_manager->setNumKarts( w->getValue() );
+        race_manager->setNumKarts( race_manager->getNumPlayers() + w->getValue() );
     }
     /*
      289         race_manager->setDifficulty((RaceManager::Difficulty)m_difficulty);