fixes bug on windows caused by bad merge