More selector fixing