Adjust for API change