Added infinite recurention protection for chariman