Attempted a fix on the hunter catch