Should fix CI builds

Needs further testing was "fixed" from Mac.