GH-18 adding the missing units