Another attempt to stabilize CI