2.0 fix schema locking