Fix to use modified API.