closes #2276