closes #1498