Extend previous change for flat arrays as well.