Fix array parsing to properly use correct entries