Rebuild following merge of #89