fix retrieve_target