fix the notify bugs