Notifications order fix