fixing somme troubles on notification system