async issues?
Merged