fix-conservatory-leaks2365 (Kindra Archibald)

Following