fixing notification code