More strict locking