closes #1539