Fix upgrade repropose

some forcing reread, I always need to check again API. I agree that it is very nasty.