seem to fix about bugs in WalshHS