Fixing notification duplication