Ok... see if the attached patch takes care of the problem...

SteveD.