Fix issue with selection