Try yet another trick to get 10->11 numbering working.