Minor fix in configuration merging.