fix & upgrade