DEV-74859 - Fix composing of basket