Improvement for drawAsInfinite - Use the label instead of index