Bug fix with npcs