Fixing windows bug