[feature/mpesa-cherry-pick] cp fix