closes Issue #1940