fixing more upgrade sadness