Sync with docx to resolve #69