Notifications order fix -yet another