fix to notification routines