add an upstream crash fix