Fix for Windows use
WIP