Fixing recursion issue.