Fix for doc-1476