Fix bug 1029678: Improve async behavior