fix(event): Address NaN bug