Hunter fix