Fix 32 bit alignment issue