[AH] [00000] Remove double wrapping