adjust to API change