Fix sponge being left behind when travelling to non-sub location