Removing the Segfault-y crap.