Fix event method