added windows workaround