Fixed selection bug (again)