Fix HAL-279