xome fixes on number case