Correct index, etc