Recoded "cbc20b" to make invalid units missing, fixes #109
Recoded "cbc20a" to make invalid units missing, fixes #108