2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb
index 53be92b90..6b6558ca3 100644
--- a/app/models/concerns/custom_fields_support.rb
+++ b/app/models/concerns/custom_fields_support.rb
@@ -16,7 +16,7 @@ module CustomFieldsSupport
     def custom_field_values= vals
       out = {}
       custom_fields.each do |code, field|
-        out[code] = field.preprocess_value_for_assignment(vals[code])
+        out[code] = field.preprocess_value_for_assignment(vals.symbolize_keys[code.to_sym])
       end
       self.write_attribute :custom_field_values, out
     end
@@ -30,7 +30,7 @@ module CustomFieldsSupport
     end
 
     def custom_field_value key
-      (custom_field_values || {})[key.to_s]
+      (custom_field_values&.stringify_keys || {})[key.to_s]
     end
 
     private
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 6236f482e..9fcfa9cd9 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -166,7 +166,7 @@ class CustomField < ActiveRecord::Base
       end
 
       def display_value
-        options["list_values"][value.to_s]
+        options["list_values"][value.to_i]
       end
 
       class Input < Base::Input