Hopefully fixed the segfaults.
Praying.