Fixed #23 - xbuild bug