Fix HAL-508