Potential fix for Encoding error in CircleCI build #3525