Fix looping Event table update