fixing Events issue