fixed crashs