No more warnings in valgrind