Fixed defect with missing array indices