Fixed segfault. Breaks test 6, but I don't thinkg we were passing that
properly anyway