Small improvement in upgrade mechanism