Missing constructor from merge of the previous commit