fix issue when using columnLock and rowLock together