follow up to the segfault fix