fixed crasher