Adapt to changes in grid of pure-0.5.0