notifications generation - bug fix