Fix CircleCI build