closes #1600