Recoded "cdi9b" to make invalid units missing, fixes #150
Recoded "cdi9a" to make invalid units missing, fixes #149