Attempt to fix events