Draft of fix for DOC-704