Fix countdown?

Change-Id: I41983b9326620bc83db0d190dc011a04f78bd85b