Make Windows-compatibility fix Unix-compatible