Fixed for x86_64