Attempting to fix max recursion error.