might have fixed notification logic