Merge "Fix the overflow not being added sometimes" into main