Proposed fix for notifications