closes #1957