Fix crashe