closes #1716, #1717