Fix wrong target selection