Fix event to resemble the original event more