Fixed ComboBox out of range bug