Fix: crasher