better repeat event fix