PIM-1104: Fix error introduced for saving and back to the grid