Fix for infinite recursion issue

- Fix for infinite recursion issue
- indent