I think I fixed a crash, but I'm not shure