Fixed select bug