Changed ComboBox behaviour (fixed #7)