Fixing notification bug