Fix for /hunt, resolved #4