Recursion Issue Fix.