closes #1718