Fix HAL-536