Fix ConcurrentModificationException in removeWidget