Fix duff conversion