Partial fix to http://jira.diamond.ac.uk/browse/DAWNSCI-861