Fixing issue with Azure.