closes #1618