Bugfix java.util.ConcurrentModificationException