Fix cell selection issue