closes #1911