Fix (untested) for ConcurrentModificationException error when binding changes