closes #1900