Solved a few segfault