fix #1321 and fix #1320 crash notifs

fix #1321
fix #1320