Fixed broken merge of #2415