Fixing some issues on repeated sections