fixed notification flow