Fix missed array indexes