Fix for Windows/MacOS