fix toNextCycle()
fix when client done