Fixed selection issues