Fix Concurrent Modification Exception