fix-conservatory-leaks5472 (Leopoldo Nuttall)

Following