Fixed a problem with references
Merge branch 'npcFix'