Better fix to http://jira.diamond.ac.uk/browse/SCI-1110