Another attempt at fixing windows build