Fix gazumping of cell selection