Fix for broken remote entity travel