Fix for notification