Manual merge of minor syntax clash