Feature/fix cell selection bug