closes #2068