Possible buildfix for CI