closes #2228