Adapted to change in S/C master.