- Fixed recursion bug