Fix after Valgrind test