fix_rollup.diff
