Fix HAL-178