Fix for HAL target 1.7.0