closes #2028