diff --git a/SwiftForms/controllers/FormOptionsViewController.swift b/SwiftForms/controllers/FormOptionsViewController.swift
index 1146359..e90d134 100644
--- a/SwiftForms/controllers/FormOptionsViewController.swift
+++ b/SwiftForms/controllers/FormOptionsViewController.swift
@@ -63,14 +63,14 @@ open class FormOptionsSelectorController: UITableViewController, FormSelector {
         cell?.textLabel?.text = formCell?.rowDescriptor?.configuration.selection.optionTitleClosure?(optionValue)
         
         if let selectedOptions = formCell?.rowDescriptor?.value as? [AnyObject] {
-            if let _ = selectedOptions.index(where: { $0 === optionValue }) {
+            if let _ = selectedOptions.index(where: { $0.isEqual(optionValue as Any) }) {
                 cell?.accessoryType = .checkmark
             } else {
                 cell?.accessoryType = .none
             }
             
         } else if let selectedOption = formCell?.rowDescriptor?.value {
-            if optionValue === selectedOption {
+            if optionValue.isEqual(selectedOption as Any) {
                 cell?.accessoryType = .checkmark
             } else {
                 cell?.accessoryType = .none
@@ -96,7 +96,7 @@ open class FormOptionsSelectorController: UITableViewController, FormSelector {
         
         if allowsMultipleSelection {
             if var selectedOptions = formCell?.rowDescriptor?.value as? [AnyObject] {
-                if let index = selectedOptions.index(where: { $0 === selectedOption }) {
+                if let index = selectedOptions.index(where: { $0.isEqual(selectedOption as Any) }) {
                     selectedOptions.remove(at: index)
                     cell?.accessoryType = .none
                 } else {