fix row overlap issue in column & row lock