Fix selection
Fix selection logic