Fixed indexed logic
Try to fixed dynamic update the values