Adjustment to match library change