Try an ugly trick to get 10->11 numbering working.