Avoiding the possiblity of a recursive loop.
Updated changelog