Fix segfault in CVS head (sorry about that)