fix bugs, but WA