Bugfix for selection stuff