Need to fix the array