Fixed select handling