Now that the DN encoding works more correct, we have to update the