First selection box bug fix