I think you interpreted my suggestion about the if() backwards.  Is
there a reason the attached patch won't work?

-- Dave