Fix to http://jira.diamond.ac.uk/browse/SCI-1012
SCI-580: properly handle 1D grid case