Merge pull request #1265 from dorkster/fixes

Fix regression in 80fbe3f (NPC hover bug)