Hpefull fixed segfault :(