Improve countdown logic of expedition.

fixed #8