a portion of a patch recently submitted by Christopher Kings-Lynne.
Applied by agreement that this is a bug fix.