Fix debian bug 716587 crash