by Eduardo Rodrigues.
Like Russ Williams, I had also to change 2 occurrences of the bug fix pointed out by Pino.
Thanks Pino!
Also, Thanks Russ (because otherwise I wouldn't catch this need. )