Fix craches