[#3028] Fix to time of adding events so state cannot break it.