Merge "Fix valgrind error."