fixed notification issues