Patch attached.  I'm not 100% sure of this since it does change behavior (but in 
a weird case).

Ken