Fix x64
another x64 fix.
workaround test for x64