closes #1557