Fix for x64