Fix #37 issue on windows/linux