[MOD] DBLocking fix merged