Fixed cell-picking bug