Commit to let it working on Windows