change to make windows work (but breaks everything else)