closes #1578