Hotfix for broken notification clearing