FIX: forgot to make valgrind optional