closes #1641