Fixes events emission again