Fix the problem where it picks wrong push target