fix make up n events
Merge branch 'hotfix/fix_make_up_3'

* hotfix/fix_make_up_3:
  fix make up n events