Fix cumulative tags issue