Undid an events fix