Fix strange bug related to arrays and objects
Merge branch 'fix-array-object'
Resolved a strange stupid merge that started with a composer problem anyway