DF-3431 crash fixed