Fix deeper recursion