closes #2117