FIx disable notification feature