Fix bug of the las commit: add conditionnal on event to define  default