more fix x64

pass the tests.