fix hunter's mistakes