closes #1719