Add x86_64 workaround