Fixed to work on ARM.  Also works on x86 targets.