Npc bug fix
Merge pull request #321 from dalkon/master

Npc bug fix