modyfy event bugfix