BaseAPI fix