fix device order numbering