Fix for document_id