Selector Bugfix