Issue #12: fix saving notifications