Fix mostly for coroutine style