fix the valrgind failure on master. This will conflicts with Paul's chan...

...geset.