Atom self referencing fix