Async bug fixed