We can keep this array as it was before if we use the fixes I mentioned below.