Incorrect indices fix