Fixing an issue with x86_64