closes #1939