Fixed infinite recursion issue.