Include Max's fix for arrays with omitted elements