Trying to fixed max recursion issue.