closes #2114