closes #1673