This array length fix is for >= 0.25