more robust docx support
make docx support more robust