Fixing handling of repeat engagements per bout