Correcting the merge of PR#2278