Fix regression due to the merge of 1.0.x branch