Attempt to fix ConcurrentModificationException with drops