Previous event manager was borked (fixes #34)