Fixed too much recursion error?