IDEX-608: fix events