Fix problem with selection