fixed returnTo behavior