Fix array construction