Fixup Repeat condition