Be consistent with other changes