Fix locked row overlapping issue