Fix due to recent API changes.