Bugfix for selection feature