fix-conservatory-leaks0617