diff --git a/app/DD-Record-Organiser/ClassControlCommands.vb b/app/DD-Record-Organiser/ClassControlCommands.vb
index 4712520..8b4354d 100644
--- a/app/DD-Record-Organiser/ClassControlCommands.vb
+++ b/app/DD-Record-Organiser/ClassControlCommands.vb
@@ -226,9 +226,7 @@
                 DEFAULTVALUE = properties.DefaultValue
             ElseIf type = "CheckBox" Then
                 DEFAULTVALUE = properties.DefaultValue
-            ElseIf type = "CheckBox" Then
-                DEFAULTVALUE = properties.DefaultValue
-            ElseIf type = "ComboBox" Then
+            ElseIf type = "CustomComboBox" Then
                 DEFAULTVALUE = properties.DefaultValue
             ElseIf type = "DateEdit" Then
                 DEFAULTVALUE = ClassConverter.ToDateTimePickerOptionsOrDefault(properties.DefaultValue)