Finally fixed that recursion error