Fixing issue with selection