Fix HAL-497