bug fix with notify