Changed the way circular reference are verified