closes #2039