Fixed event handling. Removed extra event object.