* follow api-change in several places