Additional fix for Array