Added chenges to fix the event type with space