Fix bug on event