Drain tasks in an unblocked way to avoid data race

Drain tasks in an unblocked way to avoid data race #86