Fix array-ordering issue