diff --git a/cel_checkout/cel_checkout.module b/cel_checkout/cel_checkout.module
index 3f72107..ba4e84a 100644
--- a/cel_checkout/cel_checkout.module
+++ b/cel_checkout/cel_checkout.module
@@ -236,29 +236,13 @@ function cel_checkout_mapping_submit($form, &$form_state)
             }
 
             if (isset($wrapper->field_cel_ck_scholar)) {
-
-
-                foreach ($form_state['input'] as $sProperty => $mValue) {
-
-                    if (!is_bool(strstr($sProperty, 'customer_profile_'))) {
-                        $aField = $form_state['input'][$sProperty]['field_cel_ck_scholar'];
-                    }
-                }
-
-
-                foreach ($aField as $aValue) {
-                    foreach ($aValue as $value) {
-                        $mScholar_value = $value;
-                    }
-                }
-                if (is_null($mScholar_value)) {
-                    $insert['boursier'] = 0;
-                    $add = TRUE;
-                } else {
-                    $insert['boursier'] = 1;
-                    $add = TRUE;
-                }
-
+              if ($wrapper->field_cel_ck_scholar->value()[0] === NULL) {
+                $insert['boursier'] = 0;
+                $add = TRUE;
+              } else {
+                $insert['boursier'] = 1;
+                $add = TRUE;
+              }
             }
 
             if (isset($wrapper->field_cel_ck_scholar_step)) {