changes for grid-api issue #522