Fixed Event Generation

It actually works!!