fix bugs for notification