185 avoid duplicate events

this refer to #185 issue