[#78] Fix recursion failure