fix & build