Patch attached.  Takashi, since you wrote the analogous patch for pipes, could 
you take a look?

Thanks.

Ken