Fixed bug in GridPlot figure handling