Fix for ongoing notifications