updated after test on win7