Trying to fix the notifications issue.