Potentially fixed segfaulting