Fixing event classes