Async fix for #277