closes #1774