Was segfaulting.. fixed