Fixup align all mapping