small change in entity movement handling for #63