some bug fix for notifications