Hopefully this fixes build problems on other machine