closes #1603