fix & rebuild