Fix ConcurrentModificationException
serialization fix