Event last value fix