Fix to avoid ConcurrentModificationException in policy-models