Still trying to fix windows bug