Fixing compat issue with Azure.