fixed indexes issue