Minor modification to support sub-grid data.