fixed implementation of row- and cell-level locking