closes #1721