Fix for notification validation