#108 Fix concurrent updates