diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp
index d7c521c..f2f049d 100644
--- a/src/Unuk/Game.cpp
+++ b/src/Unuk/Game.cpp
@@ -232,7 +232,7 @@ void Game::Render(void) {
 }
 
 void Game::NewSavegame(const string savegameIDArg) {
-  string saveFilename = "../Save/" + _saveGameID;
+  string saveFilename = "../Save/" + savegameIDArg;
 
 	TiXmlDocument doc;
 
diff --git a/src/libUnuk/Engine/WorldManager.cpp b/src/libUnuk/Engine/WorldManager.cpp
index e9d157f..0ed8282 100644
--- a/src/libUnuk/Engine/WorldManager.cpp
+++ b/src/libUnuk/Engine/WorldManager.cpp
@@ -127,6 +127,11 @@ void WorldManager::OnPlayerAttack(Player* player) {
       
       if(_npcs.empty()) {
         _level->Load("map");
+        
+        int spawnX;
+        int spawnY;
+        _level->FindSpawnPoint(spawnX, spawnY);
+        player->SetXY(spawnX, spawnY);
       }
     }
     else {