fix: working on async-fix