closes #2278