Fixed #5561: [2.x]Fix some issue