Fixed segfault...possibly.