fixed notification bugs