closes #1570