Fix the recursion