SEGFAULT fixed, thought I should commit just in case I break it again