Fixed Events issue