fixes #19 . But, Entities can still get stuck as a result of the fix.