Fix for ConcurrencyException