Bugfix for selection