Fixing an error
Fixing bugs in event vector