Trying to solve CI failures