Better handling for notification