Final fix for monthly rollup