fixed segfaults I think