Fix ConcurrentModificationException
Fix breaking EarlyEncode inserts (single block) in c0f368b8cbf2d8b27a1bb0091a0f2a56d5915ccf