Avoid data leakage between events (fixes failure-to-send-mail problem)