closes #2125