Fixing Windows compatibility issue