Minor improving in indexing of buffer position.