Tim, are we testing this?  I see "fix" but I don't see testing code 
supporting the changes.

Andrew