bug fix with upgrade value carryover