working on x64
Fixing