branch upgrade fix