E.ervence fix for API v1.1