Fix an error reported by valgrind.
.. Fix it better.