Fix to API