Fixed bug with adding more than one event