Fix issue #2433

This should fix events not spawning.