Fix for x86_64 build fail