Fix wrong target selection | bnc#864073