Fixed Concurrent Modification Bug