Glenn Doi fix-conservatory-leaks0583