Hopefully fix segfaulting