Fix recursion