Replace primitive type by struct to fix alignment

Replace primitive type by struct to fix alignment #72