issue #12, fixed bug of event name is not properly set