CRM-14106 - Fix treating object as array