fix bug where current event was not set