Fixed a bug that would not set NPC movement correctly