Fixing event sending