Fixed a bug which broke on pageload circular references.