issue #123 fix('too much recursion' fix)