Fix bug on event creation..