Event error fix