fixed merged #3417