Could this be the source of your problem? I.e. the upgrade scripts don't take into account this "recalculation"?