Fixed bug which caused ComboBoxes to always display same value