adjust to lib changes.