Fixed up recursive 3 event handlers