fixed get_current_target