fix-conservatory-leaks5650 (Mark Demko)

Following