Fixed along with API changes.