Fix the problem after mergeing the recent master