Recoded "cdi4a" to make invalid units missing, fixes #140