Fix HAL-155