SER-213: tidied up response