Fix timer always resetting to zero
