closes #1467