fix notification order