Fixed H17 numbering issue