fix defect 4117 and 4113