closes #2188