Work on x64 port