Fix according to CI