diff --git a/lib/evva/templates/swift/people_properties.swift b/lib/evva/templates/swift/people_properties.swift
index 9282f5f..5d7a732 100644
--- a/lib/evva/templates/swift/people_properties.swift
+++ b/lib/evva/templates/swift/people_properties.swift
@@ -40,7 +40,7 @@ enum Property {
 		<%- properties.each_with_index do |p, index| -%>
 		case let .<%= p[:case_name] %>(value):
 			return PropertyData(type: .<%= p[:case_name] %>,
-								value: value<% if p[:is_special_property] %><%= "?" if p[:is_optional] %>.rawValue<% end %>)
+								value: value<% if p[:is_special_property] %><%= "?" if p[:is_optional] %>.rawValue<% end %><%= " as Any" if p[:is_optional] %>)
 			<%- unless index == properties.count - 1 -%>
 
 			<%- end -%>
diff --git a/spec/lib/evva/swift_generator_spec.rb b/spec/lib/evva/swift_generator_spec.rb
index 027d6d6..8fe982f 100644
--- a/spec/lib/evva/swift_generator_spec.rb
+++ b/spec/lib/evva/swift_generator_spec.rb
@@ -213,7 +213,7 @@
 
             case let .reverseTrialType(value):
                 return PropertyData(type: .reverseTrialType,
-                                    value: value?.rawValue)
+                                    value: value?.rawValue as Any)
 
             case let .numberOfTimesItHappened(value):
                 return PropertyData(type: .numberOfTimesItHappened,