- upstream fix for array assembling