BugFix on notification treatment