Fix up special treatment for HIon data