improve target_class resolution for ambiguous guesses