Fixed selection handling