- fix Notification issue
merge