Fixed: use data layout for 32 and 64 bits