Improve the handling

Discard the “Coroutine” way