xd fix & build