Fixed events being broken.