Selector fix