Hopefully make the CIBuild work...