Fix event table