Fix for Windows
Fix for installation troubles