Repair XBoard from node-count patch