Windows

The latest changes didnt work under windows.