Select bug fix