Coroutine fix