Fixed NPC save/load for the 3rd time