Fix timer reset bug