closes #1616