made the callbacks safer when pushing volatile data like entities