closes #1940