Bug/incomplete async fix