Adjust to api 8.