Fixing event trigger