closes #1676