CS fix for array map closure