Fixing notification timeout