Fix strange recursion bug
Patch version: 0.0.8