Fix return_target navigation.