Fix pull_api mode