Fixed npcs :3