closes #2027