fix Current Modification Exception