proper upgrade-charm