Notifications delivery fix