Hi Arash,

Thanks, that suggestion is helpful, and seems to take care of the issue
you noted.  Please find attached an updated patch, to which I also added
a test.

thanks, best,

Paul