diff --git a/src/Client/GUI/CCursorController.cpp b/src/Client/GUI/CCursorController.cpp
index 72a76f0..07c87c2 100644
--- a/src/Client/GUI/CCursorController.cpp
+++ b/src/Client/GUI/CCursorController.cpp
@@ -54,12 +54,12 @@ void CCursorController::render()
    if(isOSCursorVisible())
    {
       irrCursorControl->setVisible(true);
-      irrCursorControl->setPosition(irrCursorControl->getPosition());
+//       irrCursorControl->setPosition(irrCursorControl->getPosition());
    }
    else
    {
       irrCursorControl->setVisible(false);
-      irrCursorControl->setPosition(irrCursorControl->getPosition());
+//       irrCursorControl->setPosition(irrCursorControl->getPosition());
    }
 }
 
diff --git a/src/Client/GUI/SceneWorld.cpp b/src/Client/GUI/SceneWorld.cpp
index eb5560e..a6429c2 100644
--- a/src/Client/GUI/SceneWorld.cpp
+++ b/src/Client/GUI/SceneWorld.cpp
@@ -96,6 +96,8 @@ SceneWorld::SceneWorld(PseuGUI *g) : Scene(g)
     driver->setFog(envBasicColor, true, fognear, fogfar, 0.02f);
 
     // setup cursor
+    // shlainn: The cursor contrpller is a horrible hack.
+    // TODO: Replace cursor controller as soon as Irrlicht 1.8 comes out
     cursor->setOSCursorVisible(false);
     cursor->addMouseCursorTexture("data/misc/cursor.png", true);
     cursor->setVisible(true);
@@ -460,7 +462,7 @@ void SceneWorld::OnUpdate(s32 timediff)
 
     str += driver->getFPS();
     str += L" FPS";
-
+    
     debugText->setText(str.c_str());