Oops - forgot to attach the patch.  Here it is.

Cheers
  Nick