Fix xnumeration