Fixed bug with current event