diff --git a/search_api.module b/search_api.module
index 72d88c25..05c67fa3 100644
--- a/search_api.module
+++ b/search_api.module
@@ -636,7 +636,7 @@ function _search_api_views_get_allowed_values($entity_type, $bundle, $field_name
     }
     $callback = $field_definition->getSetting('allowed_values_function');
     if ($callback) {
-      return $callback($field_definition);
+      return call_user_func($callback, $field_definition);
     }
   }
   return NULL;
diff --git a/search_api.views.inc b/search_api.views.inc
index a61ee54f..1e8ffcd9 100644
--- a/search_api.views.inc
+++ b/search_api.views.inc
@@ -176,11 +176,8 @@ function _search_api_views_get_handlers(FieldInterface $field) {
       $types[] = 'entity';
     }
 
-    if ($definition->getSetting('allowed_values')) {
-      $types[] = 'options';
-    }
-
-    if ($definition->getSetting('allowed_values_function')) {
+    if ($definition->getSetting('allowed_values')
+        || $definition->getSetting('allowed_values_function')) {
       $types[] = 'options';
     }