FixBug: taskwait timeout is double