Fix array expansion