further fix for #504, notificiation updates losing data