fix problem with holes in unit numbering