closes #1633