fix bugs for WAK9