Fix issue with xctools