bug fix and improvement for hunter strategy