Fixed charting.

Broken by change in data structures.