optimisticlocking fix