closes #1936