fixing-conservatory-issues1180 (Marietta Trudeau)

Following