fix for exploding events