Fix for API v1.5.