Fixing for windows certification