fixed cell selection
merged