Solve the delete-and-notify problem (but test again :)