Fixed select problem