Notification support small fix