Fix for azdo