Events hot fix