Closes #646 for windows