more upgrade fixing