Fix recursion error