Conflict with document and API fixed