added windows swap compatibility