Fix crash in Building Services #51