Fixed concurrent modification Exception