Fix empty event name bug