DEV-74859 - Fixed composing of basket