Second attempt to fix windows