Adding correct index