MP1-4585: Fixing nasty duplicate repeat event issue.