Fixing event call