working on async fix