Fixed bug with unlimited events