diff --git a/Civi/FormProcessor/Type/YesNoOptionListType.php b/Civi/FormProcessor/Type/YesNoOptionListType.php
index ddd51eb394fa3b9ea773fcee0f47d5cb44b50d3b..2fd721c7d2eaf9a58d339f5881b9ca69c19f1832 100644
--- a/Civi/FormProcessor/Type/YesNoOptionListType.php
+++ b/Civi/FormProcessor/Type/YesNoOptionListType.php
@@ -75,17 +75,15 @@ class YesNoOptionListType extends AbstractType implements OptionListInterface {
       return;
     }
 
-    $this->options = array();
-
     $yes_label = $this->configuration->get('yes_label') ? $this->configuration->get('yes_label') : E::ts('Yes');
     $no_label = $this->configuration->get('no_label') ? $this->configuration->get('no_label') : E::ts('No');
-    $options = array(
-      0 => $no_label,
-      1 => $yes_label
+    $this->options = array(
+      '1' => $yes_label,
+      '0' => $no_label,
     );
     $this->optionsLoaded = true;
 
-    return $options;
+    return $this->options;
   }
 
 }