closes #1471