closes #1729