CRM-12108 fix bug introduced when rebasing PR