closes #1912