closes #2243