Combo box fix