closes #1630