Fix valgrind issue with saved master responses