diff --git a/src/AbstractJsonEncoder.php b/src/AbstractJsonEncoder.php
index 267a426..13cf982 100644
--- a/src/AbstractJsonEncoder.php
+++ b/src/AbstractJsonEncoder.php
@@ -121,7 +121,7 @@ private function initialize()
 
     /**
      * Returns the current number of step in the encoder.
-     * @return mixed The current step number as integer or null if the current state is not valid
+     * @return int|null The current step number as integer or null if the current state is not valid
      */
     public function key()
     {
@@ -266,9 +266,11 @@ protected function resolveValue($value)
             } elseif ($value instanceof \Closure) {
                 $value = $value();
             } else {
-                return $value;
+                break;
             }
         } while (true);
+
+        return $value;
     }
 
     /**