Made compatible with Windows once again