Hardened code to cope with cyclic dependancies