Try to fix Circle CI build error, part 2