Fixup Repeat condition
Merge pull request #1972 from monarchdodra/12007-3

Fixup Repeat condition