Notify logic fix