hopefully fix race condition where events are no longer emitted
Release 2.2.1