Updated changelog.
Fixed recursion logic.
Fixed recursion logic.