Recoded "cdi6a" to make invalid units missing, fixes #143
Recoded "cdi5b" to make invalid units missing, fixes #142