fixing notification sending issues