No more valgrind errors!