Fixed infinite recursion error