Further change to satisfy new interface