fixed async issues