Fix #154 for Windows