closes #1623