Incomplete: Fix freezing issue with npc commands