closes #1953