added from forem-notif-fix