Issue refs #1783: done