Infinite recursion bug fix.