Fix crypto encryption ba-concat order