fixing async issues
0.1.7