Fix for cross-context events not properly pooling