Fix timer not using last value properly