am 4acfe7ed: Fix stack overflow exception

* commit '4acfe7ed048f265ce12842476edf07d28f595b87':
  Fix stack overflow exception