May fix segfault...